siflower: 6.12: change .remove_new callback to .remove

Move back to .remove from .remove_new as kernel 6.12 unified the usage
of .remove and .remove_new (and .remove_new is expected to be dropped in
later version)

Signed-off-by: Zhu Yujie <[email protected]>
[ improve commit description ]
Link: https://github.com/openwrt/openwrt/pull/20555
Signed-off-by: Christian Marangi <[email protected]>

diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c
index 1cd5262c0ae5f7bb70c79a8c52405f70c9a83ba4..67c949f56a61e14836d4978e5432c9958f575ad1 100644 (file)
--- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c
+++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c
@@ -68,7 +68,7 @@ MODULE_DEVICE_TABLE(of, dpns_match);
 
 static struct platform_driver dpns_driver = {
        .probe  = dpns_probe,
-       .remove_new = dpns_remove,
+       .remove = dpns_remove,
        .driver = {
                .name           = "sfdpns",
                .of_match_table = dpns_match,

diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c
index 2575ea180f7adbcfecbef28da72c26c2c204e7f7..8143bd078d1d4d758f950158f2ac2ce8f67b3033 100644 (file)
--- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c
+++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c
@@ -1606,7 +1606,7 @@ MODULE_DEVICE_TABLE(of, xgmac_dma_match);
 
 static struct platform_driver xgmac_dma_driver = {
        .probe  = xgmac_dma_probe,
-       .remove_new     = xgmac_dma_remove,
+       .remove = xgmac_dma_remove,
        .driver = {
                .name           = "sfxgmac_dma",
                .of_match_table = xgmac_dma_match,

diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c
index bd111ae5bb27ab49bf4005b7a7384b1d9e81b792..bf0e023bb0e16fb88c9a978dea1ccf88c7791380 100644 (file)
--- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c
+++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c
@@ -1288,7 +1288,7 @@ MODULE_DEVICE_TABLE(of, xgmac_match);
 
 static struct platform_driver xgmac_driver = {
        .probe  = xgmac_probe,
-       .remove_new     = xgmac_remove,
+       .remove = xgmac_remove,
        .driver = {
                .name           = "sfxgmac",
                .of_match_table = xgmac_match,

diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
index 5a0024f82774b1233b36616c02d94fc30570d43e..79964fa9e3f2060342bcfb2a6e27ff1834bf79bf 100644 (file)
--- a/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
+++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
@@ -172,7 +172,7 @@ MODULE_DEVICE_TABLE(of, dwmac_sf19a2890_match);
 
 static struct platform_driver sf19a2890_gmac_driver = {
        .probe  = sf19a2890_gmac_probe,
-       .remove_new = stmmac_pltfr_remove,
+       .remove = stmmac_pltfr_remove,
        .driver = {
                .name           = "sf19a2890-gmac",
                .pm             = &stmmac_pltfr_pm_ops,